\83Â\83Ã\82Â\8eÃ\83Â\82Ã\82Â\91Ã\83Â\83Ã\82Â\8eÃ\83Â\82Ã\82½?p=cmus.git;a=rss" type="application/rss+xml" />
\83Â\83Ã\82Â\8eÃ\83Â\82Ã\82Â\91Ã\83Â\83Ã\82Â\8eÃ\83Â\82Ã\82½?p=cmus.git;a=rss;opt=--no-merges" type="application/rss+xml" />
\83Â\83Ã\82Â\8eÃ\83Â\82Ã\82Â\91Ã\83Â\83Ã\82Â\8eÃ\83Â\82Ã\82½?p=cmus.git;a=atom" type="application/atom+xml" />
\83Â\83Ã\82Â\8eÃ\83Â\82Ã\82Â\91Ã\83Â\83Ã\82Â\8eÃ\83Â\82Ã\82½?p=cmus.git;a=atom;opt=--no-merges" type="application/atom+xml" />
Manual merge of version 2.11.0-1+rpi1 and 2.12.0-1 to produce 2.12.0-1+rpi1